Merge tag 'upstream/2016.11' into debian/master
authorSimon McVittie <smcv@debian.org>
Fri, 7 Oct 2016 20:52:26 +0000 (21:52 +0100)
committerSimon McVittie <smcv@debian.org>
Fri, 7 Oct 2016 20:52:26 +0000 (21:52 +0100)
Upstream version 2016.11


Trivial merge